Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 10:46:33 +0000 (18:46 +0800)
committerXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 10:46:33 +0000 (18:46 +0800)

Trivial merge